Merge "Mark libclang as recovery_available" am: b15c2d44dd am: 35fe7eba04 Change-Id: Iec5618bb834e79caf54d3bba164498457491c872